From 72dd10c44d83d201b6cff96cab3807fbde0b7567 Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Wed, 25 May 2005 10:56:29 +0000 Subject: [PATCH] bitkeeper revision 1.1549 (429459dd8Wdn9xpYhxSGQBJEie8pXA) XendDomainInfo.py, XendDomain.py: Disable shutdown timeout for suspend. Signed-off-by: Christian Limpach --- tools/python/xen/xend/XendDomain.py | 2 +- tools/python/xen/xend/XendDomainInfo.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index 7e9ebde84a..8a12311bd8 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -402,7 +402,7 @@ class XendDomain: if reason == 'halt': reason = 'poweroff' val = dominfo.shutdown(reason, key=key) - if reason != 'sysrq': + if not reason in ['suspend', 'sysrq']: self.domain_shutdowns() return val diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 8eba3a9aad..a243867ebd 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1136,7 +1136,7 @@ class XendDomainInfo: if self.channel: msg = messages.packMsg(msgtype, extra) self.channel.writeRequest(msg) - if reason != 'sysrq': + if not reason in ['suspend', 'sysrq']: self.shutdown_pending = {'start':time.time(), 'reason':reason, 'key':key} -- 2.30.2